Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 08:57:47 +0000 (00:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 08:57:47 +0000 (00:57 -0800)

Trivial merge